Simplify as suggested by Havoc. Just get the last iter and work backward

2001-05-22  Joe Shaw  <joe@ximian.com>

	* gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle):
	Simplify as suggested by Havoc. Just get the last iter and work
	backward to the tag instead of getting a line and working back from
	there. Fixes passing in an invalid offset to
	iter_init_from_byte_offset().

diff --git a/ChangeLog b/ChangeLog
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0df2c759485abee2c0e8d3a242c65e4fbb97f04c..103ce5aeb26a7210f60ac8d9fcc558bef68406e7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-05-22  Joe Shaw  <joe@ximian.com>
+
+       * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): 
+       Simplify as suggested by Havoc. Just get the last iter and work
+       backward to the tag instead of getting a line and working back from
+       there. Fixes passing in an invalid offset to
+       iter_init_from_byte_offset().
+
 Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview*.h: 

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 1d530321461038c1e30b630582b112808d542950..253e104ac5447e03c6c6eae817c3b377b8e0c469 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -4832,27 +4832,14 @@ _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
                                          GtkTextIter    *iter,
                                          GtkTextTag     *tag)
 {
-  GtkTextLine *line;
-
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (tree != NULL, FALSE);
 
-  line = _gtk_text_btree_last_could_contain_tag (tree, tag);
-
-  if (line == NULL)
-    {
-      /* Set iter to first in tree */
-      _gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
-      check_invariants (iter);
-      return FALSE;
-    }
-  else
-    {
-      iter_init_from_byte_offset (iter, tree, line, -1);
-      gtk_text_iter_backward_to_tag_toggle (iter, tag);
-      check_invariants (iter);
-      return TRUE;
-    }
+  _gtk_text_btree_get_end_iter (tree, iter);
+  gtk_text_iter_backward_to_tag_toggle (iter, tag);
+  check_invariants (iter);
+  
+  return TRUE;
 }
 
 gboolean